progressbar: Enforce invariants

When measuring gadgets, minimum must come out <= natural.
Make sure we don't fail this when measuring progressbar text.

https://bugzilla.gnome.org/show_bug.cgi?id=765644

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index a61fcb465ecd17d919c389563de9437dfbee8da9..9ba2c86d1f60141aef52a4dde3203ffd56e7fffe 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -808,7 +808,7 @@ gtk_progress_bar_measure_text (GtkCssGadget   *gadget,
       else
         *minimum = logical_rect.width;
 
-      *natural = logical_rect.width;
+      *natural = MAX (*minimum, logical_rect.width);
     }
   else
     *minimum = *natural = logical_rect.height;